Adwaita: shortcutswindow fixes

use darker text and tweak the keycap vertical centering,
addresses https://bugzilla.gnome.org/show_bug.cgi?id=761778

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 23a258bbe61e16916c6bbe29b91c0260561c81c9..0903a4ebb0b7553683da00a2cb79faea7ee02c0a 100644 (file)
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3758,11 +3758,12 @@ button.circular { // FIXME: aggregate to buttons
 .keycap {
   min-width: 20px;
   min-height: 25px;
+  margin-top: 2px;
   padding-bottom: 3px;
   padding-left: 6px;
   padding-right: 6px;
 
-  color: if($variant == 'light', $insensitive_fg_color, $fg_color);
+  color: $fg_color;
   background-color: $base_color;
   border: 1px solid;
   border-color: if($variant == 'light', mix($borders_color, $bg_color, 50%), $borders_color);
@@ -3772,7 +3773,7 @@ button.circular { // FIXME: aggregate to buttons
 
   &:backdrop {
     background-color: $backdrop_base_color;
-    color: if($variant == 'light', $backdrop_insensitive_color, $backdrop_fg_color);
+    color: $backdrop_fg_color;
   }
 }
 

diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index a0ae7e29cfac35b65c5558d2d1363b43ab50b791..17e27851804caf95dd99fb3bbe6e2f0bec919d16 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -4456,6 +4456,7 @@ button.circular {
 .keycap {
   min-width: 20px;
   min-height: 25px;
+  margin-top: 2px;
   padding-bottom: 3px;
   padding-left: 6px;
   padding-right: 6px;

diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 21fca0a568da89c96f464dd6aac3d1ea0983314b..b545116cf8042a399ab4c5f0eddfa2a136a23a19 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -4598,10 +4598,11 @@ button.circular {
 .keycap {
   min-width: 20px;
   min-height: 25px;
+  margin-top: 2px;
   padding-bottom: 3px;
   padding-left: 6px;
   padding-right: 6px;
-  color: #8b8e8f;
+  color: #2e3436;
   background-color: #ffffff;
   border: 1px solid;
   border-color: #c3c3c0;
@@ -4610,7 +4611,7 @@ button.circular {
   font-size: smaller; }
   .keycap:backdrop {
     background-color: white;
-    color: #c3c3c0; }
+    color: #8b8e8f; }
 
 *:drop(active):focus,
 *:drop(active) {